dgit.raspbian.org Git - gtk4.git/commit

projects / gtk4.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4de4d6a f0a211a)

author	Federico Mena Quintero <federico@gnome.org>
	Fri, 19 Oct 2012 16:35:22 +0000 (11:35 -0500)
committer	Federico Mena Quintero <federico@gnome.org>
	Fri, 19 Oct 2012 16:35:22 +0000 (11:35 -0500)
commit	1dfd0e8c9b95e44f94bf6079e7472ccea55c9608
tree	392619dfd790bda5ea040729f0586362ec5bda5d	tree \| snapshot
parent	4de4d6a6a7e47c6fba916551116d663e7c7ccb68	commit \| diff
parent	f0a211a1df968393ff07e43672be64f854179c5b	commit \| diff

Merge master into places-sidebar to keep up with development

gtk/Makefile.am	diff1 \|	diff2 \|	blob \| history
gtk/gtkfilechooserdefault.c	diff1 \|	diff2 \|	blob \| history
gtk/gtkmarshalers.list	diff1 \|	diff2 \|	blob \| history
po/POTFILES.in	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.